From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 16 Jul 2013 19:48:27 +0000 (-0400)
Subject: util: Fix hasPendingMessages
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3929
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a8fe063726b6136ebb71cb372b3bfee399f04662;p=gnome-shell.git

util: Fix hasPendingMessages

While the UserVerifier does indeed have a _userVerifier inside
it, the hasPendingMessages property is on ourselves, not
_userVerifier.

https://bugzilla.gnome.org/show_bug.cgi?id=704347
---

diff --git a/js/gdm/util.js b/js/gdm/util.js
index cae3e1b23..c79958de6 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -163,7 +163,7 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     answerQuery: function(serviceName, answer) {
-        if (!this._userVerifier.hasPendingMessages) {
+        if (!this.hasPendingMessages) {
             this._clearMessageQueue();
             this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
         } else {
@@ -423,7 +423,7 @@ const ShellUserVerifier = new Lang.Class({
             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
 
         if (canRetry) {
-            if (!this._userVerifier.hasPendingMessages) {
+            if (!this.hasPendingMessages) {
                 this._retry();
             } else {
                 let signalId = this._userVerifier.connect('no-more-messages',
@@ -433,7 +433,7 @@ const ShellUserVerifier = new Lang.Class({
                                                           }));
             }
         } else {
-            if (!this._userVerifier.hasPendingMessages) {
+            if (!this.hasPendingMessages) {
                 this._cancelAndReset();
             } else {
                 let signalId = this._userVerifier.connect('no-more-messages',